auto merge of #816 : alexcrichton/cargo/issue-812, r=brson
authorbors <bors@rust-lang.org>
Tue, 11 Nov 2014 01:59:36 +0000 (01:59 +0000)
committerbors <bors@rust-lang.org>
Tue, 11 Nov 2014 01:59:36 +0000 (01:59 +0000)
Closes #812


Trivial merge